Remove unused constants, whitespace changes