cleanup and testing