Removing unnecessary TODO