some cleanup. initial commit