Some Clean-up done.