clean up and match the code for trunk on AMBER and Release Candidate on our board