-getting rid of some redundant stuff now.