more cleanup of core