cleaning up following merge