Drop more no-longer-used code