removed unnecessary imports/variables, fixed TODO