Cleaned a bit of unused defines
Merge branch 'master' of https://github.com/TKRTAP/TKRTAP