Large cleanup of uneccessary classes, and comments.