Removed TODO I already DID