removing use of dataobjectaspages module (not complete yet)