Remove return values from functions which don't need