remove old/commentedout stuff.