minor cleanup, revert if broken