code refactor
improved runtime.
deactivated delete test