Added main file
Corrected remove base method
Hot fix