Trimming down the Core and Radio classes
Not needed anymore.