cleanup armv7-a cruft