cleanup - we no longer use page manager etc.
Merge branch 'feature/99999_cleanup' into develop