SWEB-453 code cleanup and new plugin classes