Cleaning up magic uses