Remove code that was no longer needed