Some cleanup
Moving to cleanup-based approach for timeout querying