Removed some garbage code
Merge branch 'master' into kyle