Alignment Fixer Cleanup