Removed out of date @todo items