Further method simplification

[skip ci]