removing unneeded code before refactoring