[Declaration] clean up