Remove all explicit returns