MH-9989, Fixed some dependency issues
MH-9989, Removed unused methods