fixed useless stuff