Separated the job clean up from the job completion.
Removed some commented out code.
Fixed the list endpoint so it doesn't return null for an empty list.