Cleanup and hide master