layout cleanup