Cleaned up some comments and depricated code.