Cleaning up space

Change-Id: I97bfa23f98f7e44ea3c9041959379c1fb14b41e4