Switched to using integer based ids in actual storage
Check for index not existing before deleting