Clean up the site builder code