Cleaning up, obsolete.