Removed un-necessary class-map details