Make sure to remove the items
Remove obsolete code

Also rename the final binary
Fix the mem leaks