Removed bits and pieces that we didn't need for this layout