removing unused modules and cleaning up lines