Master’s Office clean up ‘long overdue’