Removed old main method