Cleaning up character stuff. Smashing dependencies.