Getting rid of notioncore