Switched to use removeData instead of deleting from data object