Remove callbacks and fix tests