more clean up and increased timeout to 1200