Hopefully dealing with leftovers in the client (probably not correctly).