get rid of all commented code before :ship: