Cleanup
Moved reused code to RadixCore