Remove unused settings imports
Some PEP8 tidying