Fixed Lightning Cleanup