cleaning up post merge