Remove classes that are now available via common-plugin