Performance - remove counter-productive caching
Remove duplicated function
Typo in comments