WIP: Removing unused classes and Field type