Remove ordering randomicity and stuff