cleaned up remnants from t