removing redundant methods
Merge branch 'benhenry'