Cleaning up STGP classes