cleaned up and removed pw access