Cleaned some files commented out unused parts.
Looked at Kronox handling