removed some removal codes