Clean up interval logic