Updated to cleanup wish if built