Cleaned up unused code and comments.