Update Remove Class Items

Now works as intended without having to hardcode every single class
entity.