get rid of old unnecessary stuff
refactoring and get rid of unnecessary stuff