Take care of remoing functionality