Removed grace and wait time variables

Integer doesn't work with time so I can't set it as integer and check
the difference between integer and time