removing legacy customer-specific code