Storage classes cleanup.