Misc repo cleanup