cleanup, adjustments, removed the tray again for now.