Remove some fields from import process and ct's according to Stefan's instructions
Merge remote-tracking branch 'origin/master'