remove obsolete Struct slot type

plus some minor cleanups