Remove _factory suffix from factory files
Remove idle timer  (essentially) if in development