removing stuff not appropriate for master