Issue #111 - Remove unnecessary runtime checks