Removed legacy classes, some refactoring

Removed some of the Mobilecloud template classes