Cleaned up support for customer