remove reverse logic
clean up