Code cleanup - removed unused code and add inline injection