Merge pull request #8 from mjberger/master

clean up of 2 directories
removed common block stuff not used