Remove some no-longer-used code