some cleanup and empty test...