Edited model and added migration

Removed clusters tagged from datasheet
Merge branch 'master' into deploy