remove query folder, remove some main method