Final changes to fix termination time and deleting credential