Removing ST2 dependency