Removed check_friendlies and continued moving things to DB instead of XML