Add second expiry. Remove comments with logging
Update documentation