Code clean up from merger with latest Class2Go
Code clean up from merger with latest Class2Go