Merge pull request #360 from gena-m/master

remove unused definitions