remove unecessary logic