Merge "Removes unused & untested methods"