Remove setting shell due performance issues