removing some unnecessary stuff