Removed unrequired TODO