Removed two methods.
Merge branch 'development'