initial changes to remove unused cores