cleanup, fix tokens response