Removing dependencies that we don't currently need
PEP8 fixes