Add remove gadget functionality

This is pull request for remove gadget functionality which as you told me needs some consideration. Please provide me your remarks and opinion.