cleanup and remove from catmac