License Updated: year and Copyright holder.
Refactoring of demo beans an removal of unused ones.