cleaned out a lot of unused geometry stuff