Some refactoring and cleanup
picture field migration