Remove unneeded functionality

Remove code that was providing functionality that is no longer
being used.