Final Clean-Up For Layouts