fixes + disabled cleanup for now (AlignmentModel will leak)