Cleaned unneeded headers