Cleanup and lineup