Getting rid of wasted space for the time being