YCMEPHelper: Cleanup part 3