Remove singleton:=true for OSGI