Removed static methods from factories
Moved cleanup job factories in to new bean deff
New config path