Cleaned up old flashlight code