format code and remove unuseful utils