Improve inteface and ask before remove