remove unused stuff
Merge pull request #491 from vicnet/master

Remove unused stuff