removed surplus TODO