cleaned some useless codes