More time short codes + cleanup

Cleaning up some code, removed social short codes, added more time
short codes.