Fix remove bug + remove more than 1