Comments and small mapping changes+ unused class deleted