#5 cleaning up UserBundle.