Removed lots of commented code. Cleaned imports.