some cleanup. Removing an old constructor and adding some null
field protection.