Remove old Signup stuff and added counters