Removed useless stuff
Globals
Merge remote branch 'origin/master'
Fixed variables