Cleaned up older code and comments.