Working on adding quit capability; remove redundant and unused function