Remove comments, fix PID +1