Simplify core for the time being