Remove code that is no longer used