Moved overlap detection into TimespanEntity class
clean up