needs better tests
remove unwanted