Removed migration and small refactoring
Merge remote-tracking branch 'upstream/master'