Removed some unused functions.
Some small changes
Add a strong tag
Merge commit 'ebb777a696c946e643e38e86ad8a705ab249a76e'