bug fix
bug fix. filter out deactived users, remove unnecessary code