Refractor, ensure empty classes