removed useless stuff