additional cleanup and testing