[966896] Clean up