Unnecessary removal of ep square, may actually be decreasing performance