[Declaration] Clean up