Removed Sweep class
Fixed some warnings