Remove KEEP_ORDER make flag