Add release or snapshot question and do some cleanup