Changed base type for json objects for prevent implement unneeded abstract methods
removed unneeded todo statements
Some refactoring. Remove some unused code