Updated src files and removed old dependencies
Merge pull request #1 from raginruffalo/master

Updated src files and removed old dependencies