Remove stuff from master
Remove stuff from master