Clean up of unused or redundant code and comments.