cleanup from snafu earlier today w/ master