Merge pull request #11 from tgrrtt/develop

ng cleanup
Removed unused vars