Patch 2

Remove unused variables, fix some prints.