cleaned up UserBundle