Cleaned up a bunch of files before I start to convert

Kjell