cleanup - remove commented / unneeded code

Due to code refactoring