#23 removed module core.model