Improve: code arrangement
Remove: deprecated methods
Remove: unused aliases