Comment out boilerplate

I didn't realize this was possible.
Remove dependence on getCurrentTime
Reduce number of definitions