Clearing some cruft from master