Clean up and remove edit button