strpping out cruft in master