Removing classes from more things, but running into an issue where I'd really like inheritance :-/
Converted  more classes