AESH-253

improvements

comment removed