undid some of the changes as didn't fix cluster issue