more cleanup before starting on more code.