code cleanup - removed unused code
Merge pull request #68 from Astro03/master

code cleanup - removed unused code