Removed unused methods
Merge branch 'dev'