clean up TODOs and warnings