Added not for clinical use message and some cleanup.