add completion functions
Remove unneeded aliases