More cleanup of cc2520rpi