removed some uselesss lines