remove silly uncessary logic