Spatial cleanup

This builds on another commit that made this one cleaner by removing all the delegated methods.