YCMEPHelper: Cleanup part 4