Fix whitspace.
Remove more stuff I don't use.