Update Label services, Constraint and Comment mappings and cleanunnecessary code.Change-Id: Idafdb2552a5fe73d2e9160b93992688969a50769Signed-off-by: Aurelien Didier <aurelien.didier51@gmail.com>