Deleting left over code, obeying other rules