deleted classes from upstream