Modified code in Beans and removed unwanted classes