ok, remove singleton
fix install target