Code cleanup
Remove extra header file
Merge pull request #15 from kmammou/master

Code cleanup