Cleanup imports after CPP removal + few hlint fixes#4337

jhrcek merged 3 commits intomasterhaskell/haskell-language-server:masterfrom

jhrcek/import-hlint-cleanupshaskell/haskell-language-server:jhrcek/import-hlint-cleanupsCopy head branch name to clipboard