EB-6913- Code Clean up