display timestamp when available
remove unused resources
quick fix the phone number expire issue
Merge branch 'master' into prod