Fixing saving, cyclic dependency, and removing delombok