change extended beans and remove unused files