get rid of these returns