some more cleanup and removal of castor bits