Remove the extra code that I had reintroduced