Removed unnecessary layout and related methods