Eleminate psych dependency