Removed code cleanup

Did not need mainHandler method because program should terminate if
there is an error