Move to liberator, no longer need core