Revert "rework loading of custom item classes" and 5 other commits

I really should have done this in a separate branch :(