more removing unnecessary stuff