Cleanup: removed Motorola specifics