broken again...
remove redundancies