Revert "Added am2PInit"

This reverts commit 3b926f0dad750e32c16b74374b83453c9c2e81a9.
Fixed merge issues