Navigation to overriden/implemented method added
EA-50248 fixed
some cleaning
#SCL-6293 fixed