Remove FaciaToolLifecycle
Fix imports