Remove remaining references to modules database model in core