[master] Removing unused stuff
[master] Ready to be uploaded to oshpark