Bite the Bullet - Remove M4 Library, work in progress