Removing unused layout and commented out code