Revert "Assign a to new classes"

This reverts commit 614c01cbfe06a6e413462403c075d26e6d443989.