Revert "Added User Plan"

This reverts commit 14b00cccf33a419f4e1e0e35f903837cc8f5cc5f.
Revert "Revert "Added User Plan""

This reverts commit 1d2b7c3d3bf1a5b91f04aa47e1a84121175320aa.