Removing commented code.
Removing unnecessary imports.