added remove and complete functionality