YCMEPHelper: Cleanup part 2