Remove old complex and hacky code for #within and #duration.