Removing ifs and lazy initialization since CDI already do this job

Legacy code migrated from vr3