CLEAN: Cleanup old prefix removal code