clean up setup file
fix signup promise chaining CLUB-567