Clean-up time

Clean-up time