fixing commands and add to clean expired tokens