Assign loalized stringsn to message var
Remove unused stub method
Remove TOOD's
Don't return early from failure block