removing unnecessary stuff