Import clean up, including the now eliminated uf_pages package.
Authored by: bugman 2012-05-13
Parent: [r16271]
Child: [r16273]