Removed unused classes and added copy field computed index fields