Cleanup and validation