Other geometry guessing functions already reside in block.c.

Remove some unused or debugging only fields.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>