ADEN-575 Clean up after one of the rebases