cleaned up core sources