Forgot to remove the "self" references