excess debugging removed