More cleanup before Start of classes