Cleaning out some reduntant code and files
Merge pull request #15 from Gegga87/master

Cleaning out some reduntant code and files