Remove more string substitution shenanigans