Revert "Revert ""Remove unused lines of code"""