Updated to CDI MVP 0.9.4, removed unnecessary @UIScoped declarations