Cleaned up a lot of dependencies in Space

Checkpoint.