Revert "Add missing classes based on side"

This reverts commit 358cb137cc4459dbda83d83e27a787c3ff4ae5df.