Buildings, cleaner special cell type generation