removed some no longer needed functions
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM