Clean up code spaces