Remove commment
Migrate data to current state