More clean up preparing for the setup of the core