`not` not necessary
remove unused imports
cleanup commented out code