Merge "Drop whitespace, Kconfigs, Makefile noise and dead code"