Deleted empty classes pt 2