cleanup of old and messy layouts