Whitespace tweaks, remove unused code