slightly cleaned up
pruned out stuff for dojo