some cleanup post layout usage