STILL fixing the alignment cleanup code