removing some waste code