Removing nonsense TODO ;)