removed more excess stuff