cleanuped tenant.rb => now in canvas_os.rb again