Master repository cleanups