Fixed usage, removed old TODO