Remove the LazyLoader above, not needed anymore.