little clen-up before merge to master