#2 cleanup of automation page