remnants of Bundle to Plugin changes