I would remove everything which is not used. 

Can you also add test that verify that your added functionality works?