Simplify a little bit
Merge branch 'feature-cleanup-gen_server-calls'