Make clearing a token more robust by also removing files in the token directory not created by the our code.
Remove workaround description for a problem that popped-up when running the tests for database backend after running tests for the file backend.