Wrote remove and started to test it in main