Remove NewRelic Dependency and make some improvements