City council ending David Griffin affair