update usage and remove the debug codes