Drop no-longer-used code