More Core Updates and clean up