Clean up sources and fix WorkbenchPlus infinite item bug