cleaned up loose ends, password encryption not in place