Issue #1771056 by Devin Carlson: Removed unused update functions and added missing update return value.