fix up contact and remove yaml stuff, no need