Added remove from json and some other stuff
Merge