strip out unnecessary logic