Cleaning up assembly drivers
Merge commit 'e3541ec'