fix for remove methods