Cleaned up dead code
cleaned up dead code
Merge pull request #118 from devdame/jay_clean_up

code clean up