remove a lot of unused code

bye bye!
sure this is correct?