Remove unused code
Add empty handler class
Create alias command