Added some more remove code