Lock the populated fields and remove un needed fields for SCHOLAR 3.3

Relate to issue #1485 

I've merged all the files that needed for the behat test to work.