Dead code
Added page type, sub-model type improvements