Removed echo and die statements

Replace with return statement. Don't know why they were there in the first place..