Merge branch 'cleanup-hwmod' into cleanup