Moved OtherInventory to UserHandler, cleaned up code