removed missed merge cruft