Clean up deprecated commands