typos and more conversion tests
remove unused or duplicate functions