remove debug output, handle strict types