Revert "Adding prototype scope for more beans"

This reverts commit 1f24a0b21f59f8d47898c400522dd426067a9e44.