initial cleanup from tipa.li