Finished delete implementation