Clean up master