removing some useless stuff