Quick patch for 1.2
Deleted unused class
Deleted global methods from main class