Cleanup of unused beans (closes #977)