Get rid of return