Cleaning up the layout field service