Cleaned up the rest of run lists