remove PrepareCompletion logic