Remove comments & add deadlockfree