Core cleaned up