Remove deadlines (finally)

Fix #1263