Attempt to further clean migrations/scheme