Remove HTP to main class