Got rid of unnecessary dispatch to main