source cleanup - removing uneeded return statements