remove unused code to fix tests