Removing unused methods
Merge branch 'pr/94'