more core cleanup