Remove old custom command function
Remove old functions
Remove old functions