Revert "resolve others challenges alignment issue"

This reverts commit d20ec82d6193164d7ef6debc9ddece6599efbae5.