removed extras from setup