Clean up space issues