Remove ESP stuff