Removed unnecessary lines.
Merge branch 'development'