Cleaned crappy headers