Removed old code and comments.