More cleanup
Merge pull request #3 from CarbonDev/jb2-PIE

More cleanup