cleaned up modules.py
cleanup old code