Kill the empty spaces that dont exist.

Change-Id: I760cb42ea07874c1252b4159e306881691e93e24