Cleanup things that went into the core repository