Fixed removal functionality