Also cleaning up the migration stubbed classes per review
Attach a file by drag & drop or click to upload
