Ensure working id is an integer
Remove cruft