Remove unneeded includes, debugging
Typo fix