Removed unused code EBS