Removed the O(n) object removal issue. Fixed throwing;