Massive cleanup of comments and unused code