removed out-dated TODO item
fixed error logging