[TIMOB-13315] Cleaned up more plugin code