cleanup
Cleanup and test