remove unnessisary code
cleanout more code