Remove active property and disable check for time
Cleanup