removed broken stuff