Fixed some broken specs
Removed old header