remove stuff I dont need
further file cleanup
Merge remote-tracking branch 'upstream/master'