EB-7529: Code Clean up