Cleaning up code for new version of admbsecr.
Fixing conflicts.