Added codes for advanced remove tool