Bugfix: Cleanup order
Actually CALL client code