Cleanups, simplification & fixes for broekn resource handling