Updated usage and removed a completed TODO