remove more functions
more rules reordering
more reordering