#21 Deleted unused return vals