code clean up - 20 users