removing comments and unused stuff