Fixed lightning remove