Removed everything extraneous to the himss branch