Code cleanup

Same here. Can replace with boolean field and remove `aasm`.