Remove field dumping code.
Do some reorganisation and code clean-up for access.