cleaned up some stuff that became redudent