Hopefully removed all ::class uses now