clean up and rebuild to test