started a little refactoring
removed commented code
little refactoring to FieldService
little refactoring to FieldService
more refactoring to FieldService
resolved merge conflict