cleanup
pre-alpha. uses sql only