eliminate warnings and old todos