Issue #73 Remove comments