Clear and other Stuff

Clear tabultations and delete unused code