[master] Clean up