Initial with cleanup