Removing factord related code per #133