Removing TODO