Remove unneessary returns from methods