Removed some conversation stuff from the database, updated errors in master