WIP: Remove unused classes