Cleanup and features.