Clean up Motorola stuff that won't be used again