Removed SimpleInv stuff, still need to fix & cleanup some code