First pass of deletion stuff added.