restructure model to make sense, delete supported