Took out some unnecessary debugging
Merge branch 'sm1215'