removed some useless thigs