Removed cleanup steps to ensure working build