3.0 - Remove time constants

Will fix #2783