minor cleanup post merge