clean up and testing