Removed outdated headers (mentioned parts have been rewritten)