removed some unecessary update/delete code