chinook: updated TODO + file cleanup