remove Q and modify models