Remove pointless class for now