Remove code that may have been unneeded