fixed unnescessary stuffs