Removed redudant methods
Merge branch 'development'