Removing core for now