methods order
remove dead code