combine dispose/remove methods
update version