Cleanup of build with assembly addition and merge strategies