Changed remove mechanism