Fixed some stuff regarding deleting and removed editing