Re-removed main()