Extra space cleanup