removed unneeded requires
removed out set stuff
Merge remote-tracking branch 'origin/master'