Remove unnecessary step in setup