Remove more logic