Using release and some cleanup