Method cleanup, no LBS dependency, in-house SQL management