removed more redundant stuffs