Reduced warinings. Cleaned up a bunch of commented out code that is no
longer needed. Cleaned up imports.