Remove logic and tests