Cleanup Bean Defs