added checks to cli

also removed some refs to filecrypt