removed useless stuff #2