Adding in cleanup clause