Clean-up command loading