remove dependency + minor fixes