Last bit of core cleanup