Remove Content hierarchy
Cleaning methods in remaining classes
Using new Portal API