Move all deprecated methods down

[skip ci]
shorter version
more unused code

[skip ci]
remove comments