big code cleanup 2

remove some code for now