Method reordering and removal of unused (ugly) function.