layout cleanup and remove cruft