changes to MainClass, removed handlers