Remove classes that blocks the autobuild