remove struct return types from functions