AMEC-2252 updated dependencies.  cleaned up code.