And I guess these functions (and line 74 above) aren't needed either.