cleanup and testing work