update depenedancies and cleanup
Merge pull request #464 from ctomc/updates

update depenedancies and cleanup