Fixed issues with removing items