Code cleanup for AbstractContent activity

Code cleanup for AbstractContent activity, after porting to new json
model, a lot of things changed