This does not seem related to the layout cleanup