Remove fixed-sized classes properly