Added automatic removal