Cut out obsolete geometry code