More cleanup of crystal.py

Just deleting old things and moving them around to other files.