remove some uncess. stuff