eol and other cleanup