Add cleanup code