Cleanups, remove normalization.py