Removed debugging additions that could cause issues