Some minor changes, removed unnecessary code

Some minor changes, removed unnecessary code
Merge pull request #70 from cyndibaby905/master

Removed unnecessary code