Tidy code formatting
Remove EP1 after reloads as well