Remove deprecated class
Remove HTP to main class
Merge pull request #433 from dreamteam69/master

Remove deprecated class