remove some old cruft from aggregator (first prep for two-step chain reserve)
fix parsing of cli timestamp (fix from Carlos de Souza Lima Junior)