Fix TAP issue
Remove comments