WEBLAB-568 Remove deprecated content manager class. + Minor code refactoring to imporve sonar scores.