remove comments and unused stuff