Remove unused stuff. Code actually running now.