Whitespace fix, remove unneeded constants and headers