Bit of cleanup. Removed errorenous headers.