Move validateMapping code into separate class

Meanwhile removed the now unused checkConfig methods

Change-Id: I0c7192c59198a92d9ba3e22bf1b44db3522b2c24