Removed unecessary TODO