Exception declarations and removed unsued code
Merge pull request #36 from zackthehuman/master

Code cleanup for GCC again