added repo required tags
refactoring
remove obsolete method
refactoring
refactoring