Cleaned up, took out additional MD testing lines