Remove code that wasn't needed