Updated for custom.py changes

Updated commands to work with the cleanup changes in custom.py

Untested changes