Removed a return self dependency