Added removal functionallity