remove definitions not needed for now
PEP8 changes