140612 Removed singleton