removed old/commented code and unused comments
renames file