moved executionService.shutdown to the end of the shutdown procedure

This is something I would add as a comment; especially for myself because I tend to forget this kind of stuff.