Remove unused include files, minor code clean-up.