removed stray refrences to layout