Schedule delete + several fixes