Customer Module clean-up