Restore original headers
Remove wrongly placed classes