clear dead includes, and remove extra newlines