remove redunant stuff