remove typos, unused stuff and shit...