More cleanup in bean builder