Clean up layout controller