Added more remove logic
Added new methos