Doing some code cleanup.
Remove non used items
Merge pull request #484 from alexbegt/master

Doing code cleanup.