Removed some junk
bugfix
Merge remote-tracking branch 'origin'