Remove unused stuff
Fix segfault
Rename executable