Clean up for master