Remove un-used imports, PEP8 fixes