minor cleanup, eod push