remove unneeded logic