CXX-300 Remove goodies.h