Finished migrating CPTs to plugins