removed rogue code and comments