Revert "Revert "Merge remote-tracking branch 'jamesward/jamesward-cleanup'""

This reverts commit 32a23fd62fe2be114dc1661bdc7905357b629a66.