remove shall setup (issue-88)