Getting rid of LOTS of unneeded comments and related stuff