Cleaned up deadcode and comments.