Remove un-needed layouts and comment tags