2nd commit

CleanUp of Crap