removing more extranious code