Create cleanup

Do some housekeeping.