Clean up of the shaft