Removed core references from views