Remove unused modules and fix issues caught by linting program