cleanup for recent layouting changes