Cleaned up automodel task slightly