Remove unused code
Swap methods position for simplification of the coming refactoring