Remove Space Handling

Simplifying, not currently used.