Remove handle management