Removed the legacy methods. Did some cleanup proposed by sonar.