Removed unnecessary layouts/code.