Remove unused and inconsistent return values