add '-l' for common file and remove some dead code.