Removed a useless method and updated TODO